projects / dcmtk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c315bf2)
Update patches to new upstream
authorGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:35:44 +0000 (12:35 +0100)
committerGert Wollny <gw.fossdev@gmail.com>
Mon, 7 Nov 2016 11:35:44 +0000 (12:35 +0100)
debian/patches/01_dcmtk_3.6.0-1.patch patch | blob | history
debian/patches/02_system_charls.patch patch | blob | history
debian/patches/03_datadic_install.patch patch | blob | history
debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch patch | blob | history
debian/patches/05_performance.patch patch | blob | history
debian/patches/06_soversion_abi.patch patch | blob | history
debian/patches/07_dont_export_all_executables.patch patch | blob | history
debian/patches/08_remove_system_processor.patch patch | blob | history

diff --git a/debian/patches/01_dcmtk_3.6.0-1.patch b/debian/patches/01_dcmtk_3.6.0-1.patch
index f03a0aba5194764e430c1494ef04fbd1022c9454..9763e7f4188ee3908aedf90abf6576b357406b77 100644 (file)
--- a/debian/patches/01_dcmtk_3.6.0-1.patch
+++ b/debian/patches/01_dcmtk_3.6.0-1.patch
@@ -4,8 +4,10 @@ Description: The original maintainer Jürgen Salk applied
  changes to C++ code
 Forwarded: no
 
---- a/dcmqrdb/etc/dcmqrscp.cfg
-+++ b/dcmqrdb/etc/dcmqrscp.cfg
+Index: b/dcmqrdb/etc/dcmqrscp.cfg
+===================================================================
+--- a/dcmqrdb/etc/dcmqrscp.cfg 2016-11-07 12:34:04.883035438 +0100
++++ b/dcmqrdb/etc/dcmqrscp.cfg 2016-11-07 12:34:04.855035786 +0100
 @@ -10,6 +10,9 @@
  NetworkTCPPort  = 104
  MaxPDUSize      = 16384
@@ -16,7 +18,7 @@ Forwarded: no
  #
  # UserName      = <not used>
  # GroupName     = <not used>
-@@ -28,12 +31,13 @@ HostTable BEGIN
+@@ -28,12 +31,13 @@
  # NOTE: in the current implementation you cannot substitute an IP address
  # for a hostname.
  #
@@ -36,7 +38,7 @@ Forwarded: no
  #
  HostTable END
  
-@@ -51,8 +55,9 @@ VendorTable BEGIN
+@@ -51,8 +55,9 @@
  #       VendorName = SymbolicName
  # The symbolic name should be defined in the HostTable.
  #
@@ -48,7 +50,7 @@ Forwarded: no
  #
  VendorTable END
  
-@@ -70,8 +75,13 @@ AETable BEGIN
+@@ -70,8 +75,13 @@
  #               Entry in HostTable                      |
  #               ANY
  #
@@ -65,9 +67,11 @@ Forwarded: no
 +#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
  #
  AETable END
---- a/dcmqrdb/docs/dcmqrcnf.txt
-+++ b/dcmqrdb/docs/dcmqrcnf.txt
-@@ -44,8 +44,8 @@ Example:
+Index: b/dcmqrdb/docs/dcmqrcnf.txt
+===================================================================
+--- a/dcmqrdb/docs/dcmqrcnf.txt        2016-11-07 12:34:04.883035438 +0100
++++ b/dcmqrdb/docs/dcmqrcnf.txt        2016-11-07 12:34:04.855035786 +0100
+@@ -44,8 +44,8 @@
  NetworkTCPPort  = 104
  MaxPDUSize      = 8192
  MaxAssociations = 20
@@ -78,7 +82,9 @@ Forwarded: no
  
  NOTE: You must have root privileges to bind port 104 for DICOM association 
  requests on Unix/Linux/Posix platforms as this is a privileged port number 
---- /dev/null
-+++ b/dcmwlm/wlistdb/OFFIS/lockfile
+Index: b/dcmwlm/wlistdb/OFFIS/lockfile
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/dcmwlm/wlistdb/OFFIS/lockfile    2016-11-07 12:34:04.855035786 +0100
 @@ -0,0 +1 @@
 +
diff --git a/debian/patches/02_system_charls.patch b/debian/patches/02_system_charls.patch
index 77505cb0a2ab8a8dbbd79589d1f239385d28b82c..6f13cbb48fa4307ba303c6e0817b95e8665e155c 100644 (file)
--- a/debian/patches/02_system_charls.patch
+++ b/debian/patches/02_system_charls.patch
@@ -3,8 +3,10 @@ Author: Mathieu Malaterre <malat@debian.org>
 Bug-Debian: http://bugs.debian.org/705923
 Forwarded: no
 
---- a/dcmjpls/CMakeLists.txt
-+++ b/dcmjpls/CMakeLists.txt
+Index: b/dcmjpls/CMakeLists.txt
+===================================================================
+--- a/dcmjpls/CMakeLists.txt   2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/CMakeLists.txt   2016-11-07 12:34:04.919034990 +0100
 @@ -2,6 +2,6 @@
  PROJECT(dcmjpls)
  
@@ -13,8 +15,10 @@ Forwarded: no
 +FOREACH(SUBDIR libsrc apps include)
    ADD_SUBDIRECTORY(${SUBDIR})
  ENDFOREACH(SUBDIR)
---- a/dcmjpls/libsrc/CMakeLists.txt
-+++ b/dcmjpls/libsrc/CMakeLists.txt
+Index: b/dcmjpls/libsrc/CMakeLists.txt
+===================================================================
+--- a/dcmjpls/libsrc/CMakeLists.txt    2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/libsrc/CMakeLists.txt    2016-11-07 12:34:04.927034891 +0100
 @@ -1,7 +1,7 @@
  # declare additional include directories
 -INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
@@ -25,8 +29,10 @@ Forwarded: no
  
 -DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
 +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
---- a/dcmjpls/libsrc/djerror.h
-+++ b/dcmjpls/libsrc/djerror.h
+Index: b/dcmjpls/libsrc/djerror.h
+===================================================================
+--- a/dcmjpls/libsrc/djerror.h 2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/libsrc/djerror.h 2016-11-07 12:34:04.931034841 +0100
 @@ -24,7 +24,7 @@
  
  #include "dcmtk/config/osconfig.h"
@@ -36,8 +42,10 @@ Forwarded: no
  
  /** Helper class for converting between dcmjpls and CharLS error codes
   */
---- a/dcmjpls/libsrc/djcodecd.cc
-+++ b/dcmjpls/libsrc/djcodecd.cc
+Index: b/dcmjpls/libsrc/djcodecd.cc
+===================================================================
+--- a/dcmjpls/libsrc/djcodecd.cc       2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/libsrc/djcodecd.cc       2016-11-07 12:34:04.931034841 +0100
 @@ -37,7 +37,7 @@
  #include "djerror.h"                 /* for private class DJLSError */
  
@@ -47,8 +55,10 @@ Forwarded: no
  
  E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
  {
---- a/dcmjpls/libsrc/djcodece.cc
-+++ b/dcmjpls/libsrc/djcodece.cc
+Index: b/dcmjpls/libsrc/djcodece.cc
+===================================================================
+--- a/dcmjpls/libsrc/djcodece.cc       2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/libsrc/djcodece.cc       2016-11-07 12:34:04.931034841 +0100
 @@ -55,7 +55,7 @@
  #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
  
@@ -58,17 +68,21 @@ Forwarded: no
  
  BEGIN_EXTERN_C
  #ifdef HAVE_FCNTL_H
---- a/dcmjpls/apps/CMakeLists.txt
-+++ b/dcmjpls/apps/CMakeLists.txt
-@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
+Index: b/dcmjpls/apps/CMakeLists.txt
+===================================================================
+--- a/dcmjpls/apps/CMakeLists.txt      2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/apps/CMakeLists.txt      2016-11-07 12:34:04.931034841 +0100
+@@ -8,5 +8,5 @@
  
  # make sure executables are linked to the corresponding libraries
  FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
 -  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
 +  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
  ENDFOREACH(PROGRAM)
---- a/dcmjpls/libcharls/CMakeLists.txt
-+++ b/dcmjpls/libcharls/CMakeLists.txt
+Index: b/dcmjpls/libcharls/CMakeLists.txt
+===================================================================
+--- a/dcmjpls/libcharls/CMakeLists.txt 2016-11-07 12:34:04.935034792 +0100
++++ b/dcmjpls/libcharls/CMakeLists.txt 2016-11-07 12:34:04.935034792 +0100
 @@ -1,5 +1,5 @@
  # declare additional include directories
 -INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index abc3e79fa0e09b1ba28e162139f7bbac3c471a5b..8e6ebbdf6fc6dcfdeaffc1f6924dad1534a26a46 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -3,15 +3,19 @@ Author: Mathieu Malaterre <malat@debian.org>
 Bug-Debian: http://bugs.debian.org/709123
 Forwarded: no
 
---- a/dcmdata/data/CMakeLists.txt
-+++ b/dcmdata/data/CMakeLists.txt
+Index: b/dcmdata/data/CMakeLists.txt
+===================================================================
+--- a/dcmdata/data/CMakeLists.txt      2016-11-07 12:34:04.991034096 +0100
++++ b/dcmdata/data/CMakeLists.txt      2016-11-07 12:34:04.987034145 +0100
 @@ -1,2 +1,3 @@
  # declare installation files
 -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
 +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
 +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
---- a/CMake/GenerateDCMTKConfigure.cmake
-+++ b/CMake/GenerateDCMTKConfigure.cmake
+Index: b/CMake/GenerateDCMTKConfigure.cmake
+===================================================================
+--- a/CMake/GenerateDCMTKConfigure.cmake       2016-11-07 12:34:04.991034096 +0100
++++ b/CMake/GenerateDCMTKConfigure.cmake       2016-11-07 12:34:28.000000000 +0100
 @@ -83,10 +83,10 @@
    SET(ENVIRONMENT_PATH_SEPARATOR ";")
    # Set dictionary path to the data dir inside install main dir (prefix)
diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index 84d18e38b07a71c59d37e89bee0c397063b2b55c..a4020f67fa6ac890340859f8cdd26a3d78941520 100644 (file)
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -17,9 +17,11 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  10 files changed, 610 insertions(+), 132 deletions(-)\r
  create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h\r
 \r
---- a/CMake/osconfig.h.in
-+++ b/CMake/osconfig.h.in
-@@ -1137,4 +1137,7 @@
+Index: b/CMake/osconfig.h.in
+===================================================================
+--- a/CMake/osconfig.h.in      2016-11-07 12:34:05.083032955 +0100
++++ b/CMake/osconfig.h.in      2016-11-07 12:34:05.011033847 +0100
+@@ -1132,4 +1132,7 @@
  /* The path on the Android device that should be used for temporary files */
  #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
  
@@ -27,8 +29,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 +#cmakedefine HAVE_DECLSPEC_ALIGN
 +
  #endif /* !OSCONFIG_H*/
---- a/config/aclocal.m4
-+++ b/config/aclocal.m4
+Index: b/config/aclocal.m4
+===================================================================
+--- a/config/aclocal.m4        2016-11-07 12:34:05.083032955 +0100
++++ b/config/aclocal.m4        2016-11-07 12:34:05.043033451 +0100
 @@ -1490,6 +1490,47 @@
  fi
  ])
@@ -77,8 +81,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  
  dnl
  dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
---- a/config/configure
-+++ b/config/configure
+Index: b/config/configure
+===================================================================
+--- a/config/configure 2016-11-07 12:34:05.083032955 +0100
++++ b/config/configure 2016-11-07 12:34:05.067033154 +0100
 @@ -15004,6 +15004,66 @@
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -146,8 +152,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  CFLAGS="$DEBUGCFLAGS $CFLAGS"
  CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
  
---- a/ofstd/tests/toption.cc
-+++ b/ofstd/tests/toption.cc
+Index: b/ofstd/tests/toption.cc
+===================================================================
+--- a/ofstd/tests/toption.cc   2016-11-07 12:34:05.083032955 +0100
++++ b/ofstd/tests/toption.cc   2016-11-07 12:34:05.083032955 +0100
 @@ -17,6 +17,11 @@
  
      OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch
index 78ea45f0231b9e3d2e7e91c181c24ea1f7b39ac5..b350ea28446c4ba5796f327734f238c892bcb0cb 100644 (file)
--- a/debian/patches/05_performance.patch
+++ b/debian/patches/05_performance.patch
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/785400
 Forwarded-Upstream: yes
 Description: Fix a DCMTK performance problem
 
---- a/dcmnet/libsrc/dul.cc
-+++ b/dcmnet/libsrc/dul.cc
-@@ -1841,7 +1841,7 @@
+Index: b/dcmnet/libsrc/dul.cc
+===================================================================
+--- a/dcmnet/libsrc/dul.cc     2016-11-07 12:34:05.135032311 +0100
++++ b/dcmnet/libsrc/dul.cc     2016-11-07 12:34:05.103032708 +0100
+@@ -1789,7 +1789,7 @@
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }
  #endif
@@ -15,8 +17,10 @@ Description: Fix a DCMTK performance problem
  
  #ifndef DONT_DISABLE_NAGLE_ALGORITHM
      /*
---- a/dcmnet/libsrc/dulfsm.cc
-+++ b/dcmnet/libsrc/dulfsm.cc
+Index: b/dcmnet/libsrc/dulfsm.cc
+===================================================================
+--- a/dcmnet/libsrc/dulfsm.cc  2016-11-07 12:34:05.135032311 +0100
++++ b/dcmnet/libsrc/dulfsm.cc  2016-11-07 12:34:05.135032311 +0100
 @@ -2431,7 +2431,7 @@
            return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
          }
diff --git a/debian/patches/06_soversion_abi.patch b/debian/patches/06_soversion_abi.patch
index e293e58bdd46a00dd6dbdf573ce221d92ccb0924..8342e98ff5d2b8004cdcb4890738fe2f88829524 100644 (file)
--- a/debian/patches/06_soversion_abi.patch
+++ b/debian/patches/06_soversion_abi.patch
@@ -2,8 +2,10 @@ Description: Add abi-version to library name
 Author: Gert Wollny <gw.fossdev@gmail.com>
 Last-Update: 2016-04-09
 
---- a/CMake/dcmtkPrepare.cmake
-+++ b/CMake/dcmtkPrepare.cmake
+Index: b/CMake/dcmtkPrepare.cmake
+===================================================================
+--- a/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.159032014 +0100
++++ b/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:28.000000000 +0100
 @@ -56,7 +56,7 @@
  #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
  
diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch
index a04c5017c52ba7c5a24a826eb5cdc5c911f80158..f60c1718374709676c7441e15f829639f55f4abe 100644 (file)
--- a/debian/patches/07_dont_export_all_executables.patch
+++ b/debian/patches/07_dont_export_all_executables.patch
@@ -7,8 +7,10 @@ Description: Don't add executables to cmake exports
 Author: Gert Wollny <gw.fossdev@gmail.com>
 Bug-Debian: http://bugs.debian.org/803304
 
---- dcmtk-3.6.1~20150629/CMake/dcmtkMacros.cmake       2015-06-29 10:56:45.000000000 +0200
-+++ dcmtk-3.6.1~20150629.new/CMake/dcmtkMacros.cmake   2015-10-28 17:34:00.561427435 +0100
+Index: b/CMake/dcmtkMacros.cmake
+===================================================================
+--- a/CMake/dcmtkMacros.cmake  2016-11-07 12:34:05.215031320 +0100
++++ b/CMake/dcmtkMacros.cmake  2016-11-07 12:34:05.211031369 +0100
 @@ -55,11 +55,11 @@
          ENDIF(WIN32 AND NOT MINGW)
  
diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
index c519c82ce4a3b056053b5d07c06d2ed9f0df88e4..0c2a92be315d5831125bc9ea953c82a306e61e80 100644 (file)
--- a/debian/patches/08_remove_system_processor.patch
+++ b/debian/patches/08_remove_system_processor.patch
@@ -2,8 +2,10 @@ Description: Remove the systemprocessor name in the compilate
  Required for reproducible builds, and it is also not reliable 
 Author: Gert Wollny <gw.fossdev@gmail.com>
 
---- a/CMake/GenerateDCMTKConfigure.cmake
-+++ b/CMake/GenerateDCMTKConfigure.cmake
+Index: b/CMake/GenerateDCMTKConfigure.cmake
+===================================================================
+--- a/CMake/GenerateDCMTKConfigure.cmake       2016-11-07 12:34:05.287030428 +0100
++++ b/CMake/GenerateDCMTKConfigure.cmake       2016-11-07 12:34:05.231031122 +0100
 @@ -64,15 +64,6 @@
  
  # Configure file
@@ -20,9 +22,11 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
  # Configure dictionary path and install prefix
  IF(WIN32 AND NOT CYGWIN AND NOT MINGW)
    # Set DCMTK_PREFIX needed within some code. Be sure that all / are replaced by \\.
---- a/CMake/dcmtkPrepare.cmake
-+++ b/CMake/dcmtkPrepare.cmake
-@@ -355,11 +355,6 @@
+Index: b/CMake/dcmtkPrepare.cmake
+===================================================================
+--- a/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.287030428 +0100
++++ b/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.231031122 +0100
+@@ -359,11 +359,6 @@
    OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
    MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX)
  
@@ -34,8 +38,10 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
  
  ENDIF(WIN32)
  
---- a/config/include/dcmtk/config/osconfig.h.in
-+++ b/config/include/dcmtk/config/osconfig.h.in
+Index: b/config/include/dcmtk/config/osconfig.h.in
+===================================================================
+--- a/config/include/dcmtk/config/osconfig.h.in        2016-11-07 12:34:05.287030428 +0100
++++ b/config/include/dcmtk/config/osconfig.h.in        2016-11-07 12:34:05.271030626 +0100
 @@ -30,9 +30,6 @@
  /* Define if __attribute__((aligned)) supports templates */
  #undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES
@@ -46,8 +52,10 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
  /* Define if char is unsigned on the C compiler */
  #undef C_CHAR_UNSIGNED
  
---- a/ofstd/libsrc/ofconapp.cc
-+++ b/ofstd/libsrc/ofconapp.cc
+Index: b/ofstd/libsrc/ofconapp.cc
+===================================================================
+--- a/ofstd/libsrc/ofconapp.cc 2016-11-07 12:34:05.287030428 +0100
++++ b/ofstd/libsrc/ofconapp.cc 2016-11-07 12:34:05.283030477 +0100
 @@ -124,6 +124,9 @@
  
  #endif // DCMTK_USE_WCHAR_T
Unnamed repository; edit this file 'description' to name the repository.